am bb67b67c: am fd5b29be: Merge "Extend vold support for creating ext4 images."

* commit 'bb67b67cc760e4eab8a144d1ce1df9ad2dcdc8c2':
  Extend vold support for creating ext4 images.