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

* commit '3af88bc6377f50904ad3172b06f76d95ceda9cda':
  Remove the arm64 special case.