Merge "Blacklist the GOMACC_PATH environment variable"

am: b2498a22c2

Change-Id: I987d05196b3b15f5019f7a9497867fa9c39cec12

core/goma.mk

@@ -14,6 +14,9 @@
 # limitations under the License.
 #
 
+# Used by the compiler wrapper, but should only be set by gomacc
+unexport GOMACC_PATH
+
 # Notice: this works only with Google's Goma build infrastructure.
 ifneq ($(filter-out false,$(USE_GOMA)),)
   # Goma requires a lot of processes and file descriptors.