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

Change-Id: Ia276f1f7f87037fb4c61b53ba60cb5151fd1cc1d