Cherry pick -DATRACE_TAG=... from goog/master branch.

Test: normal build
Change-Id: I6410b9e99dab76cbfbc27041f461ba46f9abf539
2 files changed