Merge "Pass the right dex_file/method_index for String.<init>." am: d991e5119a
am: 6093766584

Change-Id: I4a0b8cf048fcc9960c4080fdae83fe2c92ac8e30