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

Change-Id: Ib5c3b7ff44dd6931d2a5c41c5f6f8730c59d0e9f