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