Merge "Extend vold support for creating ext4 images."