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

Change-Id: I5e08076759e8ba4d35c76d9da19e6607e5515958