Revert "property_context: split into platform and non-platform components." am: aa03ef26 am: 620d078e am: 9ce3ffe1 am: aed3cee7 Change-Id: Ib33f96e0a8313d4c7dbd3ab8c37dfcc681695103