Merge "Makefile: copy mke2fs.conf to ota root" am: d5f8deb3ac am: 5ce1b40d4e am: 947c43cbc1  -s ours
am: 8176435968

Change-Id: Ic90413974ed110c332003cbe776dd4e5bb7b1633