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