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

Change-Id: I98cbad2150e23a485da05134ecaa36c262ac2889