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

Change-Id: Ibb81cc0cb31a1d915d9f6fc145b02b8eb6ef7546