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

Change-Id: I3b7c015a8fb37aa5b135e7b329f31c9bf4d31166