Merge "Check USE_GOMA consistently"
am: 049dd57872

Change-Id: Ia838646334435a7bdbd862db2c7b2a697c791265