am 6b779109: am 8df113f2: Merge "We can no longer use "adb shell sh -c ..." internally"

* commit '6b779109688796a55f005e7e8d946c3c2ce41a54':
  We can no longer use "adb shell sh -c ..." internally