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

Change-Id: Idd5047085fe3faec708acf709a03093221bc0b59