Merge "Add odm sepolicy support to selinux.cpp" am: f899548cdb
am: 1aecf73b43

Change-Id: Ic28dffc35974efc51c4c780a4be075b45d94eaff