am cd3f60f3: Merge "AArch64: Make frameworks/base code more portable"

* commit 'cd3f60f30366a34b4499aab5a47b622069ba9cd6':
  AArch64: Make frameworks/base code more portable