Merge "e2fsdroid: support multiple selinux file contexts"