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

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