Merge "Enable goma in soong"
am: 753ed863c5

Change-Id: I10cd9f5f447124b0aff58b8aaf7a0fadafe3ac59