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

Change-Id: I814068b7798f1122adf45cd148b378ee58788562