Merge "AdbWinApi: switch to Android.bp." am: f22e0b738a
am: 11a3544fc7

Change-Id: I1af5b1f5a9bb500ea88daba11aa4bcb3ee59a75d