Merge "[adb] Use STL for ParseUInt() implementation" am: 61bffa5fc0
am: 71d621dd36

Change-Id: I33ed23676adafc81df5a47ddff93b413747f53de