resolve merge conflicts of f5b35b6 to stage-aosp-master

Change-Id: Ie1ac182893214022a68746f563765f6a271f8d1d

diff --cc cmds/atrace/atrace.cpp
index b7208d3,a6d93dc..3afeaae
--- 1/cmds/atrace/atrace.cpp
--- 2/cmds/atrace/atrace.cpp
+++ b/cmds/atrace/atrace.cpp
@@@ -881,7 -808,7 +887,7 @@@ static void dumpTrace(int outFd
  
              if (zs.avail_out == 0) {
                  // Need to write the output.
-                 result = write(outFd, out, bufSize);
 -                result = write(STDOUT_FILENO, out.get(), bufSize);
++                result = write(outFd, out.get(), bufSize);
                  if ((size_t)result < bufSize) {
                      fprintf(stderr, "error writing deflated trace: %s (%d)\n",
                              strerror(errno), errno);
@@@ -901,7 -828,7 +907,7 @@@
  
          if (zs.avail_out < bufSize) {
              size_t bytes = bufSize - zs.avail_out;
-             result = write(outFd, out, bytes);
 -            result = write(STDOUT_FILENO, out.get(), bytes);
++            result = write(outFd, out.get(), bytes);
              if ((size_t)result < bytes) {
                  fprintf(stderr, "error writing deflated trace: %s (%d)\n",
                          strerror(errno), errno);
@@@ -912,12 -839,9 +918,9 @@@
          if (result != Z_OK) {
              fprintf(stderr, "error cleaning up zlib: %d\n", result);
          }
- 
-         free(in);
-         free(out);
      } else {
          ssize_t sent = 0;
 -        while ((sent = sendfile(STDOUT_FILENO, traceFD, NULL, 64*1024*1024)) > 0);
 +        while ((sent = sendfile(outFd, traceFD, NULL, 64*1024*1024)) > 0);
          if (sent == -1) {
              fprintf(stderr, "error dumping trace: %s (%d)\n", strerror(errno),
                      errno);