Merge "Revoke ftrace selinux access from dumpstate"