Merge "atrace: Enable sched_waking if available" into oc-dev
am: 4b37107002

Change-Id: I961c608a96040cfd87bd55249617c715cb6d6488