am 50e99111: am 54bea362: Merge "Use aarch64-linux-android-4.9 for arm64 build (attempt #4)"

* commit '50e99111795af08c7a9c687da6680554c2b54f80':
  Use aarch64-linux-android-4.9 for arm64 build (attempt #4)