Merge "EnvironmentTest.java: update testHidePid2 to support latest kernel"