am 52f5425f: Merge "Fix Vold to properly handle full-disk file systems"

* commit '52f5425ff53216e3d7e2410bffd05e0df2b13c9c':
  Fix Vold to properly handle full-disk file systems