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

* commit 'eac3f9ec6acd79c2f09ae85e96cfc2a9bfa83003':
  fix arm64 build