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

Change-Id: Ia24e8eb3bc9b1b9ea5ce4047233c3cbd82016e29