am af63dab4: am 76209885: am ef2ca310: Merge "Provide support for ARM on AArch64 builds as well."

* commit 'af63dab4f7c0135d4f9ebb4c1c0cc52bcd9d9f91':
  Provide support for ARM on AArch64 builds as well.