Merge "We can no longer use "adb shell sh -c ..." internally"