am 258bf46e: support for per-partition fs_type (do not merge)

Merge commit '258bf46ea6bb4f25d01fab1b783238589e5bbec4' into gingerbread-plus-aosp

* commit '258bf46ea6bb4f25d01fab1b783238589e5bbec4':
  support for per-partition fs_type (do not merge)