Merge "Fix the build breakage on git-wear-master/mirror-aosp-master-with-vendor"