Merge "Build mke2fs.conf with Android.bp."
am: d561c2658d

Change-Id: I35a04d8f26e8fb4294276f88dc1b441c6bf8d6c4