Merge "support make_f2fs with casefoling support" am: 0548bafe93 am: b593fa77a1

Original change: https://android-review.googlesource.com/c/platform/development/+/1367738

Change-Id: Ic47ae06cc39a8e1d83b168fb67acc5d18f523b60