Manually merge commit '398e284' into stage-aosp-master

* commit '398e284':
  Revert "Update generated files for Android"
  Revert "android: libext2fs and com_err for windows"
  Update generated files for Android
  android: libext2fs and com_err for windows
  android: add the ext2simg tool
  android: add rules to build the static host libraries
  e2fsdroid: create incremental images
  e2fsdroid: read and enforce android's permissions
  e2fsdroid: add an option to generate a base_fs file
  e2fsdroid: a tool to create android compatible image
  misc: add callbacks to populate_fs
  libext2fs: add context to get_alloc_block
  libext2fs: android sparse io manager

BUG:33304034