Merge "Merge crt cc_objects" am: 821e375664 am: d7676cc86c

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

Change-Id: I4733dddc2db6168d1eaf6a3207a39d162ad54e5f