Merge "fix arm64 build" into jb-dev