Merge "Handle lsdump paths containing soong config hash" into main