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

Change-Id: Ie2a40317a617261cc57621d82a32cd7b5428537e