Merge "Fix cf_x86_phone-userdebug_coverage build"