Merge "Pass the right dex_file/method_index for String.<init>."