Merge "SELinuxHostTest: fix failures due to ps -Z output change"