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

Change-Id: I07be8c612ab048807fb26cdef455060acb5c911a