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

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