Merge "e2fsdroid and mke2fs are dynamic executable in recovery partition" am: d4f5ca9f0c
am: 3167250d6c

Change-Id: If2bfaa18c81c65a1b19acc0c9dd525b83c095a9e