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

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



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