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

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



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