Merge "bp2build: convert more cc_objects"