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

Change-Id: I0738945becbe3274551d7be56f71ed427569cfc4