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

Change-Id: Idecfbea8725d9a0145d9acc17959a59d730ccc3c