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

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