Merge "Refactor ClassLinker & ImageWriter to use a common resolution routine"