Merge \"Do not use popen, it uses a hardcoded path for \"sh\".\"
am: dbc326d42d

Change-Id: I088c0c2214d7086a9f40236d8715b5562f22a1fe