Merge changes Ice07f892,Ie1f082a0 am: 74a33fbcef
am: 053eba0bc1

* commit '053eba0bc1c6cebb5ddb323fae28d0f95cfff4b0':
  libcutils: don't build for Windows.
  adb: don't link against libcutils on Windows.