Merge "build mke2fs and e2fsdroid as static executables for recovery mode am: 05a31e2c5d am: 6ba274bec2  -s ours"