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