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

Change-Id: I5e31ed34bbaf173577b3b33bbda0f4e4c6a67f92