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

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