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

Change-Id: I9e83f2d4a842a3d7bea624ce0e978374899ebe1d