Merge "Canonicalize saved paths, Kythe cannot handle symlinks" am: bd1f870df3

Change-Id: Ic274bf1c2369c96f3a3fb98c5c40d49d8a76adb4