[automerger skipped] Migrate filesystem ftrace events from userdebug.
am: 6039fb7147  -s ours

Change-Id: I318fb1f69744f91d917235a6f4aa4d15a64c0bfe