Merge changes I36b66fc5,I0561affb
am: 166e716851

* commit '166e716851a11f1c2280b211fe00017e1eb2c3b5':
  libcutils: turn on -Werror on Win32, fix resulting build break.
  libcutils: add prefix to local variables in Android.mk.