am 1ff2df3f: am 82a2687a: Merge "Fix cp(1) for files in /proc."

* commit '1ff2df3f642018277066d73fcd57db08d41d387f':
  Fix cp(1) for files in /proc.