Merge "Revert "Ensure that readlink has access to /proc/self/fd""
am: 5a3ab3422d

* commit '5a3ab3422d8b8f500eda70edf7b0fff83656603a':
  Revert "Ensure that readlink has access to /proc/self/fd"