Merge "libcutils: 64-bit compile issues"