Merge "Revert "Add a tool to list contents of .img file"" am: 76c255f4

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



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