Merge "Depend on mke2fs.conf.recovery." am: aa536568b3 am: e6c86871f4
am: 6a122dceb3

Change-Id: I1e1e887629a586dfb32321a054369eda7fa8a276