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

Change-Id: I24a74d15153c6451e4e69ce64a80bc6fdf93eec7