Merge "Fix libbase file.Readlink test on marlin/sailfish."
am: 3052d123a8

Change-Id: I54cf0e2f4adc1786bff40e3fa5b5f97e9c7514d6