am c0cd9ce5: Merge "Revert "Fix arm64 build""

* commit 'c0cd9ce5df753161aabb393420a8ada8f369b551':
  Revert "Fix arm64 build"