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

* commit '57c9b95b1f62ceec18c56ac10fb137a96e7a2287':
  Get arm64 to compile.