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

* commit '39baa8296d39edfb25f5f2a4673f6a303e1245c5':
  Get arm64 to compile.