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

* commit 'add7e67f72269d4c2d2b922cbcb7b50cfaed05d5':
  fix arm64 build