Merge "Migrate filesystem ftrace events from userdebug." am: 79babbde0a am: 5549004ed0
am: ab2a0e6de5

Change-Id: Ifab2e31f4eb53032d1a494142fe3141d23435367