Merge "Revert "Remove unused library definitions.""