Merge "fs_mgr: remount: manufacture a missing / entry for default fstab" am: 4dd15cbe24 am: ad0c249149
am: 77d23396ab

Change-Id: I2cccb4bbd16ee9212c99edc2b8739e05d935060a