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

Change-Id: I264b1168bae78aa85efbf8e74ceb22c88a680b7d