Merge changes from topic 'e2fs_build'

* changes:
  Update generated files for Android
  android: libext2fs and com_err for windows