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

Change-Id: I9ea0109a89464ae9728456d1aa3560e33edcd4be