Merge changes Ice07f892,Ie1f082a0
am: 74a33fbcef

* commit '74a33fbcef65d8964d5dfe1d6bd2f4b8d8e154b2':
  libcutils: don't build for Windows.
  adb: don't link against libcutils on Windows.