Merge "fastboot: add mke2fs and e2fsdroid to build package am: c2ca105575 am: 1a92eda0b0" into oc-mr1-dev-plus-aosp
am: 56bbb563a5

Change-Id: I6af7b17bf883d7a2ef5af3f7199326d08ef7325d