am b92f977e: merge from open-source master

Merge commit 'b92f977e82494f07657ab702494da20dab5d1138' into kraken

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