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

* commit 'ae0b28f569411e66ba16e3ad69c1fda9199201ab':