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

Change-Id: Idf9b9356482c9185f79a9b4d284c37694b6e384c