am 13eaf184: Merge "Revert "Use aarch64-linux-android-4.9 for arm64 build.""

* commit '13eaf184f6e5c803f52f5003ace36bafe64671c9':
  Revert "Use aarch64-linux-android-4.9 for arm64 build."