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

Change-Id: I004165050ab96c3a9a7f1fbcdadf84c22b8256d9