Merge "fix(aarch64): allow build with ARM_ARCH_MINOR=4" into integration