Merge "Replace sys_nice capability with rlimit rtprio" am: b74728a92e
am: 6d1326ed8a

Change-Id: I29f71da0e48cda28ff86fd45bdbc12d6402592f0