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

Change-Id: I1bd9cba1cbf2ab4af4ec286019baa6002965443a