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

Change-Id: I77ec6074e86bd23692571365aafbf8dd9b817e3c