Merge "Add a tool to list contents of .img file" am: 23ce5b4c am: 44e7cb66...

Merge "Add a tool to list contents of .img file" am: 23ce5b4c am: 44e7cb66 am: 7f1f1b73 am: 48dbbad5

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



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