am 9314823c: am 93d574f8: Merge "return to using subprocess for running commands" into gingerbread

Merge commit '9314823c06d4434bf18d589c2fdea490428becf8'

* commit '9314823c06d4434bf18d589c2fdea490428becf8':
  return to using subprocess for running commands