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

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