Merge "Check same dex file for finding class descriptor string id"
am: da2d78ba97

Change-Id: I9b1b817d53bdc3d90287a73ea1765628aa5d12bb