am 2f9c5fd4: Merge "Add standard options to readlink" into klp-dev

* commit '2f9c5fd4b9676c59839c45bf4877551188dbc22a':
  Add standard options to readlink