Merge "Fix aarch64 build."