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

Change-Id: I647101b7959a32e1028cc93c040b449a5920601e