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

* commit '6de70784ef5bdc6bf495fa86eda68deb16ef2f9e':
  Fix windows adb build