am 10766eac: am 6de70784: am 631cf146: Merge "Fix windows adb build"

* commit '10766eac61120732f11b82b1695207a3a5870a47':
  Fix windows adb build