am 31aa9e7d: am 7ba45d63: am 4743ee44: am eac3f9ec: am add7e67f: am 24fa31b2: am 36fe6994: Merge "fix arm64 build" into jb-dev

* commit '31aa9e7d561122b8fe71c9cbed64d14a086fb3f9':
  fix arm64 build