Merge "Avoid repeated building of erofs image" am: 1ab1c2ff96 am: b74a004520 am: 6edb95a4bd

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

Change-Id: I662e5c36b170462e2755a1c9224c4ef8491ed04c