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

* commit '0b472ae13d38dd166a1a35782e028ade85bf2975':
  androidfw: resolve 64-bit build issues