am 1d9c67dd: am 1bb663a8: am 26232093: am 5c72b726: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)""

* commit '1d9c67ddc5622f4d24eca0e20bbb9ddb207e724a':
  Revert "Use aarch64-linux-android-4.9 for arm64 build (attempt #3)"