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

Change-Id: I4bb034cecfab78d3a4b5683cd356c6230a04cc7a