Merge "ADHD: Clean up linker set implementation"