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

* commit '79964cdf86ce18f5911873249aa5f505be59051f':
  Fix adb shell escape handling.