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

* commit '520a5673fbe8bff90954045b24a361982861ef8d':
  AArch64: Make AssetAtlasService 64-bit compatible