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

Change-Id: I23031dcaae42872862bbca69be3081bda74832f5