Merge "Refactoring: use generic reloc constants"