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

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