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

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