am 3523412f: merge from open-source master

Merge commit '3523412f43ec616775a73f5fb8a2615370a1ee3a' into kraken

* commit '3523412f43ec616775a73f5fb8a2615370a1ee3a':
  Add -l option to `adb sync`
  vold: fix a bug of crash