Merge changes I0432d0b1,I55d673ef

* changes:
  logd_integration_test: reboot
  logd_integration_test: remove servicemanager
diff --git a/logd/LogAudit.cpp b/logd/LogAudit.cpp
index 17c2237..01c78c2 100644
--- a/logd/LogAudit.cpp
+++ b/logd/LogAudit.cpp
@@ -222,9 +222,6 @@
         *cp = ' ';
     }
 
-    while ((cp = strstr(str, "  "))) {
-        memmove(cp, cp + 1, strlen(cp + 1) + 1);
-    }
     pid_t pid = getpid();
     pid_t tid = gettid();
     uid_t uid = AID_LOGD;