Merge "Fix the build break in git_master-without-vendor"