Merge "androidfw: resolve 64-bit build issues"