[automerger skipped] Merge "Updated AdbUtils.java and memutils file" into...
[automerger skipped] Merge "Updated AdbUtils.java and memutils file" into oc-dev am: 32d81736 am: dc21ac3c -s ours
am skip reason: Change-Id I554ac7674317cf203206411b69e6e4ef31883e75 with SHA-1 622c2d77 is in history
Change-Id: Id24a1a23c382144fdfc7cf4275fafd01ec4d2627