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