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

Change-Id: Idb430e984e0ae1473c236e513d0e7de72a88a5d2