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

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

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



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