am 49b7ba4d: Merge "AArch64: Make AssetManager and related classes 64-bit compatible"

* commit '49b7ba4dbc0b4984fc466bb98e9cfa40650db85b':
  AArch64: Make AssetManager and related classes 64-bit compatible