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

Change-Id: Idc8bb805b3ff77b67ac140316c1201e5055f77b4