Merge "support mounting f2fs in recovery mode" am: a062fae9d7 am: 15e957d3f6
am: 6b4a2c4553

Change-Id: I0276732b6acd77541172d612587abba9222ab484