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

Change-Id: Iefc52f91a0d81030988169afef64de5be00556e0