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

* commit 'e87dab14ee2914308b96488c8a2b1d22a25473aa':
  Remove the arm64 special case.