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

Change-Id: Idc66112bedc8f6a31bd73e479bd8905a7875d360