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

* commit '63b77748946dc1c18c758d9094e8b735de5ef249':
  Handle non-format partition in Vold