Merge "load selinux property_contexts in /odm and /product" am: 7e6dc56b85
am: c031e13664

Change-Id: I85ef04b2513977e8cfb8e8ed6161349367b3272c