Merge "Stop using __system_property_area__"
am: 90c12683ee

Change-Id: I0afb47de26af57c9568047a6f29370125aee203f