am 631cf146: Merge "Fix windows adb build"

* commit '631cf146274e4f0ef425fd491d39c969a20628a1':
  Fix windows adb build