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

Change-Id: I53bd70ae87fc69ae82dfbefe48fa42d60ef438eb