Merge "Update filesystem permissions in atrace.rc to give selinux control." am: bf5e6b1a99 am: 2cffba66f3
am: 0ee727d91a

Change-Id: I33cff50f908b3b7d038deb19c2745aa6dd9130d8