Merge "Fix adb shell escape handling."