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

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