am 07fa0433: Merge "Remove the arm64 special case."

* commit '07fa043341ad057ea79ca973089609965ba6c4f9':
  Remove the arm64 special case.