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

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