Merge "Don't call realpath on a file that may not exist."
am: 73209a4a64

Change-Id: I3eb3bc9e876f3efdafd738da2d43fa9ad5e8d0be