am aee7db81: am 2ef82cff: (-s ours) am d1b11a04: am e656be33: Merge "Add |opts| argument to android_fork_execvp_ext"

* commit 'aee7db815235f64896b38cba74a06523a8bee5f7':