Merge "Handle non-format partition in Vold"
am: 385ca5d236

* commit '385ca5d236547a767133abcd44dff12ca7b805be':
  Handle non-format partition in Vold