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

Change-Id: Ib75862d5ff87aea6ffa10adfcf9d07ceadb1f955