Merge "Dedup cc binary build components registration" am: e24093a784

Change-Id: I671227906222038e87f0a94b05f1674bf7ad9e5d