Merge changes from topic \'prop-security\'

am: 65fc485574

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

init/init.cpp

@@ -602,6 +602,7 @@ int main(int argc, char** argv) {
     restorecon("/dev");
     restorecon("/dev/socket");
     restorecon("/dev/__properties__");
+    restorecon("/property_contexts");
     restorecon_recursive("/sys");
 
     epoll_fd = epoll_create1(EPOLL_CLOEXEC);

init/property_service.cpp

@@ -79,7 +79,8 @@ void property_init() {
     property_area_initialized = true;
 
     if (__system_property_area_init()) {
-        return;
+        ERROR("Failed to initialize property area\n");
+        exit(1);
     }
 
     pa_workspace.size = 0;