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

Change-Id: Ibfb06c7cd01dbd7d4322a42622b819ac77410dc1