Merge "Fix adb shell escape handling." am: 79964cdf86
am: a55d6810b7

* commit 'a55d6810b7e2149ddf792f04ee16980b62e0fc2d':
  Fix adb shell escape handling.