Merge "Clean up use of art::Exec versus execv."