Merge "Convert e2fsprogs targets to soong."