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

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

Change-Id: Ic817e59b41511ae9ede542b725a07c9df96cf68c