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

Change-Id: I24908d40847ed41c9c7ee385e30244ff5efbce4a