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