Merge "Load selinux compat file if it exists" am: 0cd8102bbd
am: a2a0781df1

Change-Id: I1927fa37cb81128f712c97254ea54a74b854935c