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

Change-Id: I2cf800172e5e0a07e8b084e3176215ba4c96b3d2