Revert "Make sure that const-class linkage is preserved, try again."
Reverting due to test failures as expected.
Bug: 30627598
Bug: 33231647
This reverts commit cb5ab359.
Squashed revert "Additional debug logging for bug 33231647."
This reverts commit 00a44103.
Change-Id: I0c0ee1f70d47540fec99f8a797ce13571c16147c