am 49dd77d6: am 220b921a: Merge "We need to build the ARM components for AArch64 as well."

* commit '49dd77d69cff662dd36bad2866bf1b325fdddb30':
  We need to build the ARM components for AArch64 as well.