Rework to handle golden-common and u8500-common repos