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

Change-Id: I0a943e77cf07728850b2547334a2a9568f47457c