Merge "e2fsdroid and mke2fs are dynamic executable in recovery partition" am: 9b5d4ea20f am: 681ae40d41
am: 4a9c02ed3a

Change-Id: I65837935963edd20fa10d86ed7f3e3545489a1a2