Merge "support mounting f2fs in recovery mode"
am: a062fae9d7

Change-Id: I5f9798c1d901e98240831297aadadf39158cf2fc