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

Change-Id: Ifb1fea264d14e67948d5d9fef4c49e6657dbe855