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

Original change: undetermined

Change-Id: I72661961bf126835884ef17a01c67954cac0a810