Merge changes I36b66fc5,I0561affb am: 166e716851 am: 8e82180c83
am: d9a3f0b65f

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