am 24fa31b2: am 36fe6994: Merge "fix arm64 build" into jb-dev

* commit '24fa31b221631c4711c527281ceb980e021aa05b':
  fix arm64 build