am 8d12b4a0: am 4fe48966: am 57c9b95b: am 39baa829: Merge "Get arm64 to compile."

* commit '8d12b4a0901df4ab708243b4cd36c19ac2002a50':
  Get arm64 to compile.