Merge "add make_erofs to otatools to support erofs apex" am: d4248892 am:...

Merge "add make_erofs to otatools to support erofs apex" am: d4248892 am: 90a8a8b8 am: f63e3bcc

Original change: https://android-review.googlesource.com/c/platform/build/+/2477085



Change-Id: I902fedcad79461d179d8264a5fac511bbeaaa0c4
Signed-off-by: Automerger Merge Worker <android-build-automerger-merge-worker@system.gserviceaccount.com>