Merge "add EROFS apex support." am: 2e62ca1a am: ae9b1f1c am: 4d3549aa

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



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