[automerger skipped] Add Goldfish to soong name spaces of CSI products am: cc61b88880 -s ours am: 2ca7079ae7 -s ours

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

Change-Id: I932eeb6c804fb4f7bb4756e444da8b64665cdfc8