Merge "Fix bug #37284906, adb shell crashes on windows with invalid options. For example, "adb.exe shell -list" crashes without this fix. Test: adb.exe shell -list-packages" am: e275043d38
am: 3383c84039

Change-Id: Ic0d75aae1405badc8021835df498bcdbe0130088