am 9a09a523: am 0b472ae1: Merge "androidfw: resolve 64-bit build issues"

* commit '9a09a5236529962afbaba9893e5eaf72bd6621b4':
  androidfw: resolve 64-bit build issues