Merge \\\"Fix a typo in the atrace help text.\\\" am: 133650e5b1 am: 97acea9a6f
am: 8f44d181a1

Change-Id: If5064bb56319771d7786d645a0e67b1ce506cfe2