Merge "Fix symbol resolution within a dex file." am: 0ce76f910b
am: 4132278874

Change-Id: Idc721093812576e23ba28862da800b8daa24fbc3