Merge changes I25bdcbc5,I12314da5,I055b0821

* changes:
  adb: don't pull symlinks when pulling a directory
  adb: remove extraneous newline from skip message
  adb: correctly count skipped files in push/pull