Merge "build mke2fs and e2fsdroid as static executables for recovery mode am: 05a31e2c5d" into oc-dr1-dev-plus-aosp
am: 1d718f1426  -s ours

Change-Id: I5733477e77b216072c1d38bea82578da7ecadcec