am 8ac50107: merge from open-source master

Merge commit '8ac50107a21b96f6e9c77ab23820d164543c5bbe' into kraken

* commit '8ac50107a21b96f6e9c77ab23820d164543c5bbe':
  Allow 'adb pull' to pull symlinked files