Merge "Update atrace to work with tracefs, not debugfs"
am: a92616ecfe

Change-Id: I139cd33d0a943bff3385cbd3ebc52eb47bc82be5