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

* commit '4fe489665fef420210cd2e9ac1a682f8bfb950e9':
  Get arm64 to compile.