Merge "Set e2freefrag and e2fsdroid as required by libfs_mgr_defaults"