[automerger skipped] Refactor ClassLinker & ImageWriter to use a common resolution routine
am: d527438aea  -s ours

Change-Id: Ida801309ebf994be4b38ac18d260f6dc03f151e3