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

Change-Id: Iaa5ea4cb9bc8c045ac33c014f1283f2ef1936e56