Merge "Switch AARCH32/AARCH64 to __aarch64__" into integration