Merge "e2fsdroid: support multiple selinux file contexts"
am: 9b2f003f09

Change-Id: Ic6344d8cc308a1ea35b095e5275c394133cd99a4