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

* commit 'c4e40acff4abbe67c6a920e4715ce646c19f3fed':
  Abort if __system_property_area_init fails
  restorecon /property_contexts