Merge "Add android::base::Readlink." am: a7c4424ebc am: 910799cf41
am: 7d6b8b728d

Change-Id: I4399b9627093c6994ee2eaed88aee8323f5d20be