Merge changes from topic \'prop-security\'
am: 65fc485574

* commit '65fc48557485e0d8afafb5c8c5644d93b53c3214':
  Abort if __system_property_area_init fails
  restorecon /property_contexts