Merge changes from topic 'prop-security'

* changes:
  Abort if __system_property_area_init fails
  restorecon /property_contexts