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

Change-Id: I9e8e73a52d6fea7d880982de1138f48a5bd5d1c2