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

Change-Id: I6408482f38eb0afc3b05e11334451c9bcb7f1cce