am fe134127: merge from open-source master

Merge commit 'fe134127e5c48b5eb4801d6750664237e8e3de64' into kraken

* commit 'fe134127e5c48b5eb4801d6750664237e8e3de64':
  Allow 'adb pull' to pull symlinked files