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

Change-Id: Idd2231c7ec74f4920bf258eeaf99679bbd0096a4