Merge "Add relro support"