Merge "Revert "android: support generating ext4 partition images""