am e921da9d: am bddce34c: am 065c4180: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)""

* commit 'e921da9def56e6f70de3df18f0582a69826d9787':
  Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #2)"