Merge "Add Goldfish to soong name spaces of CSI products" am: ba88849f3c am: 682c6c1ef0 am: e4fd759490 am: 8b39dbaf1c

Change-Id: Iab633f68ce1ce6241f1aa5a3db9a11514e8f67f6