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

Change-Id: Ic44506a90ddc602c58d49ba78c91860b001f172f