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

Change-Id: If3c5628fec3cf1b47ceb9f51b1fdfe0d82c474e1