Merge "Cherry pick "-DTRACE=0" from goog/master branch."
am: c1e25bd59d

Change-Id: I2b45f6a03e390ea14164606313d5035c65af18d3