Merge changes from topic "move sched_policy functions" am: 2a2b4eec35
am: ef974c1a36

Change-Id: I571daf3bed2a2145ea85435f6d5a753635cca9f3