Merge "Revert "android: libext2fs and com_err for windows""