Merge changes I25bdcbc5,I12314da5,I055b0821 am: a3892504ac
am: 81d3447fa9

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