[automerger skipped] Add Goldfish to soong name spaces of CSI products am: cc61b88880 am: 26a72f9213 -s ours am: b08a98e397 -s ours am: 505a9f0b4d -s ours

am skip reason: Change-Id I1ca43de02909fb1d98a79a90e2facd8bb06cc2f0 with SHA-1 0990fe00f2 is in history

Change-Id: I3938fc29399eae777563cf32508bedd6a59b4cf7