Merge "adb: avoid freeing argv entries on Windows." am: 5b63cff411 am: c62f2aca24
am: bcb3f13d00

Change-Id: I141872394ba4a6f19805c3e4b038f373686d9869