Merge "Fix selinux warning on tracefs systems" am: 0ad600bdc6 am: 3915012a46
am: 67387a3510

Change-Id: I0aa3c01e3b9ed5981dccbb2fcff1e7ea5fa96c0e