This backports all fixes from OpenHarmony 3.1.1, which avoids random segfaults
in e2fsdroid.

Signed-off-by: Esben Haabendal <esben.haabendal@huawei.com>