Merge "Set e2freefrag and e2fsdroid as required by libfs_mgr_defaults" am: 405d26dacb am: f3e7db571b

Change-Id: I932b6a1085986b133440aa3f17e1544bbf536da3