Merge "Add (partial) support for Windows long paths" am: 9ed76f0acc am: d82ff9fb87
am: 73bf5a910f

Change-Id: Ib05b27914868fff938d6dd6018ed27b2715fcd4f