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

Change-Id: Ie11ea8b42fd57f035fb6b3eaca350e30ad651a9c