Merge "Move basic events into the sched category in atrace."
am: 7aaa254814

Change-Id: I9bf1ceadb8bfbb9bfa843e8d3354a1e65d3750b4