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

Change-Id: Ic603d23b7f79789bf139edfc15eb200a9608ae60