Merge branch 'arm64-for-4.8' into 4.8-all