SKY130 PDK fixes for Calibre and latest SKY130A release

[rohanku]

Related PRs / Issues

Type of change:

• Bug fix
• New feature
• Other enhancement

Impact:

• Change to core Hammer
• Change to a Hammer plugin
• Other

Contributor Checklist:

• Did you set master as the base branch?
• Did you state the type-of-change/impact?
• Did you delete any extraneous prints/debugging code?
• (If applicable) Did you add documentation for the feature?
• (If applicable) Did you update the poetry.lock file if you updated the requirements in pyproject.toml?
• (If applicable) Did you add a unit test demonstrating the PR?
• (If applicable) Did you run this through the e2e integration tests?
• (If applicable) Did you update the submodules in e2e/ if this feature depends on updated plugins?

[kenhoberkeley]

Following up on the previous comments, these specify blocks are from the std cell library, not the PDK. Did the standard cell library get fixed? - can verify this by running backannotated simulations.

[rohanku]

I made a mistake in an earlier PR and deleted those lines since I was using the SKY130 PDK version linked in the Chipyard docs. I assumed that that version was newer than the one Nayiri was using since it didn't have the same issues, but I realize now that the newer version is the one with these issues. Nayiri also bumped the Chipyard version, so that shouldn't be an issue: ucb-bar/chipyard@842c9f0.

This PR is just adding those lines back in, along with a small fix to the Calibre LVS flow.

[kenhoberkeley]

Okay sounds good, thanks for the fixes and will merge now.