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

Change-Id: I329831ecf9e4b38dbf8d7fdb76a9bba3288f5b70