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

Change-Id: Ib2120ac0b645e175dcf8a7d0926d53c5216d45af