am 7e3d563d: (-s ours) am 8341f796: am 0ec2f7da: am c532d091: am 00190a74: am f6f701bf: am 31aa9e7d: am 7ba45d63: am 4743ee44: am eac3f9ec: am add7e67f: am 24fa31b2: am 36fe6994: Merge "fix arm64 build" into jb-dev

* commit '7e3d563d65b97011ca6f808f28bf4b46671ba523':
  fix arm64 build