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

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

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