Merge "mediacodec-x86.policy: Allow media.omx to call sched_setscheduler/uname on x86 platform" am: 1a1ef1ddc2
am: 9cee5d1541

Change-Id: Iefade391ba643a990f750595ed484ad6e9859279