Merge "Enable goma in soong" am: 753ed863c5 am: cc7f1318e9
am: 00570bbbb3

Change-Id: I0344c8a2c9d2a34f36ee5d68be5ca5ebec76f60a