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

* commit '0c3d19ff3db7b04081a7a729a81642c5903f741a':
  libcutils: 64-bit compile issues