Merge "add mke2fs.conf to Android SDK build-tools"
am: fafa867f81

Change-Id: I5297e4c036155ff64368f594d0a5a94ded7f1521