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

Change-Id: I6f9dd1f9299cbb7c92108e2964f3d19f3dc71f84