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

Change-Id: I22b5041e89362267d32d57ed55cd245d0b67684d