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

* commit '36fe69940d6a6a6d9111fccb173c172ef48f7271':
  fix arm64 build