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

Change-Id: Id72cdb0a8c1530ef2253d6fdea17603ce2e376c6