Merge "Do not read moduleInfo map in Context.ModuleErrorf" into main am: 685d7febd6 Original change: https://android-review.googlesource.com/c/platform/build/blueprint/+/3342460 Change-Id: I61d05672e398574ae4378342d56198f11314006d Signed-off-by: Automerger Merge Worker <[email protected]>