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

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