am 87896b3a: Merge "Fix arm64 build."

* commit '87896b3a1f97c815fe02c7490c1f27951c58bbbf':
  Fix arm64 build.