Merge "SELinuxTest:  Add a few more cases to testFileContexts."