Merge "Revert "Make sure that const-class linkage is preserved, try again.""
am: 75d564e450

Change-Id: I401c0bf194fe814a34996055c2e4d150556245cc