Merge "Fix aarch64 custom assembler now non-uapi is gone."