Merge "Migrate filesystem ftrace events from userdebug."