Merge "Add Goldfish to soong name spaces of MGSI products" am: 9640e4a5a4 am: 86f44a2541 am: 80d7a20a83

Original change: undetermined

Change-Id: Iaab108172f3078922155a94530bd0c383b1739a7