am b152473f: am 9fce8535: Merge "AArch64: Make AssetAtlasService 64-bit compatible"

* commit 'b152473f46d8176e7eb2c55b54342a7a29c525cf':
  AArch64: Make AssetAtlasService 64-bit compatible