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

Merge commit '93d574f8c57b85e1de9fea2c7e868ac8ea56e2b9' into gingerbread-plus-aosp

* commit '93d574f8c57b85e1de9fea2c7e868ac8ea56e2b9':
  return to using subprocess for running commands