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

* commit '7ba45d63aa8e8098eb21fd4081b23f5d5267f8b6':
  fix arm64 build