Merge "Check USE_GOMA consistently" am: 049dd57872 am: 60204ae5ba am: f1d3d9aab7
am: 9b02b82945

Change-Id: Iba34cf7f5ef922a7cec28a7274b78af004de745f