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

Change-Id: I1cbd518bf3179b71790ce40b2d1f2bf299cfdecf