Merge "Make the mke2fs.conf can be included by the others" am: 23eb9f12fc

Original change: https://android-review.googlesource.com/c/platform/system/extras/+/1476636

Change-Id: I1d1c4f89178fb32b4d555abcf2af90b02a70d4ff