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