Merge changes I25bdcbc5,I12314da5,I055b0821
am: a3892504ac

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