Merge changes from topic "revert_androidSetThreadPriority_api"

* changes:
  Revert "Add choice for changing sched policy when setting thread priority"
  Revert "Fix API for C compatibility"