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

Change-Id: Iae5cd6e98d974af685486e341c3a43eb152d3cec