Merge "Add Goldfish to soong name spaces of CSI products" am: ba88849f3c am: 682c6c1ef0 am: e4fd759490 am: 8b39dbaf1c am: b96bcbf3dd

Change-Id: I3eacb4cbb5e1b75ae37653afdeb22b3af3e5a739