resolved conflicts for 6239958b to stage-aosp-master

Change-Id: I66d12e9a15b5e6aecd4938b9ce4ac76a0f3863e4

diff --cc simpleperf/workload.cpp
index 6f07cda,42a5fdd..7e129b3
--- 1/simpleperf/workload.cpp
--- 2/simpleperf/workload.cpp
+++ b/simpleperf/workload.cpp
@@@ -108,11 -108,10 +108,11 @@@ static void ChildProcessFn(std::vector<
      TEMP_FAILURE_RETRY(write(exec_child_fd, &exec_child_failed, 1));
      close(exec_child_fd);
      errno = saved_errno;
-     PLOG(ERROR) << "execvp(" << argv[0] << ") failed";
+     PLOG(ERROR) << "child process failed to execvp(" << argv[0] << ")";
    } else {
-     PLOG(DEBUG) << "child process failed to receive start_signal, nread = " << nread;
+     PLOG(ERROR) << "child process failed to receive start_signal, nread = " << nread;
    }
 +  exit(1);
  }
  
  bool Workload::Start() {