Merge "Use sched_setscheduler instead of scheduling policy service" am: 15be520901 am: 5800022d16
am: 85186de35b

Change-Id: I28d90ed429de00f50fe882e8def16b395642ba43