Merge "base: adb.exe build error" am: 6760466063 am: fcb6c7425d
am: 48c3167899

Change-Id: Ifb934b34699bc177fb95216aa5fc66a1ef34195f