Revert "property_context: split into platform and non-platform components."

This reverts commit 262edc382ae4da130b211203bf05c03179794616.

Fixes: 34370523
Change-Id: I077d064d4031d40bc48cb39eba310e6c16b9627d
3 files changed