Merge "atrace.rc: enable schedstats by default" am: 7a8270d1ea am: 58e422c17e
am: bf78e271ce

Change-Id: Ibaa95205c960b20d14992cc5b482bab1962f7bcb