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

Test: normal build.
Change-Id: I73c1491779a3c6b4408c5e2eab1591319244e9fd
1 file changed