Merge "cryptfs: call format_f2fs correctly with proper flags" am: b9a1169eca
am: af285d98b8

Change-Id: Ia40ec01d0685769d3af5cfeeb6a76673a07dd003