Merge "Depend on mke2fs.conf.recovery."
am: aa536568b3

Change-Id: I8618e5453dc90ce122dd556f78822aa743ee7031