Revert "Rework to handle golden-common and u8500-common repos"

This reverts commit d37bb89387cbdcc970dc01c5c23c697befd5271d.