Merge "adb: make pulling symlinks and devices work." am: c8e793685c
am: 8b99185552

* commit '8b99185552fd49e7902404352e0b5fda266263fd':
  adb: make pulling symlinks and devices work.