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

Original change: undetermined

Change-Id: I6a7124513afc48232e58983dc71f237f22c1192c