am a4d7f8d4: am c1790a0b: am 0c3d19ff: Merge "libcutils: 64-bit compile issues"

* commit 'a4d7f8d4191cc4a74ef99596b19c084c93c58571':
  libcutils: 64-bit compile issues