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

* commit '1098a6202b58989048fc7d9e78b5807583fb8057':
  Fix adb shell escape handling.