Merge "cryptfs: support make_f2fs with quota" am: 7807866abe
am: 4d1c7765c8

Change-Id: Ica0836d567049774eeaf41d7f75d5cd83045edfe