Merge "Revert "Revert "Make sure that const-class linkage is preserved."""
am: 8f3435981e

Change-Id: Ia674db31f9d9da3b09cd0c325467473342c36941