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

* commit '4743ee448ea070bb886a6045d7044074c083adb1':
  fix arm64 build