Merge changes Ic8e18e61,I62c78eb8

* changes:
  vold: fix an offset one bug that makes partition 4 unusable
  vold: set state back to idle on formatting error