Merge "Makefile: copy mke2fs.conf to ota root"
am: d5f8deb3ac

Change-Id: I54d47bcf4903c5150f77276ef1b4d587ab758c6c