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