am 5db10d8e: am ae0b28f5: (-s ours) am eaf04aa0: am 3b94cef1: Merge "Add FORK_EXECVP_OPTION_CAPTURE_OUTPUT to logwrap.h"

* commit '5db10d8e86d8d63b8e45af9c14f89a7074af1e60':