Merge changes from topic "re-revert move sched_policy functions" am: 1bcb634958 am: 1b40fa6bda
am: 6433963568

Change-Id: Ia07c5f9fec24936c134ef818843a1150338e7fe4