Merge "Support loading system_ext_property_contexts"
am: b0f90aa702

Change-Id: I9b76c2f217436c257221ffdb9bc46c6678ce3ead