am 00e7f2e9: Merge "AArch64: Temporary workaround to build art"

* commit '00e7f2e935d98f0eb14f5ef1d376604d0054bf5e':
  AArch64: Temporary workaround to build art