Merge "Fix system image file diffs" into main am: 9d387fac

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



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