Merge "Revert "Refactoring: use generic reloc constants""