Merge "Blacklist the GOMACC_PATH environment variable"
am: b2498a22c2

Change-Id: I987d05196b3b15f5019f7a9497867fa9c39cec12