Merge "Fix aosp_arm64 mirror-aosp-master build 1119326"