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

Change-Id: Ib2f48cb30bfc559563ddefba7c86f0e29c252f6d