Manually merge commit 'b406ffa' into stage-aosp-master

* commit 'b406ffa':
  Add support for creating ext4 images with mke2fs

BUG:33304034