Merge "Add a soong namespace in device/generic/goldfish" am: e69b46dc9d

Change-Id: I6e384abaa458eec22f8ff237841bb85ed5a99fd4