Merge "bp2build: convert more cc_objects" am: 466b424deb

Original change: https://android-review.googlesource.com/c/platform/bionic/+/1601253

MUST ONLY BE SUBMITTED BY AUTOMERGER

Change-Id: Iebfecffe06baa15f0ed1e49577bc23078a1adfb7