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

Change-Id: I9fd4c8a848864dbe9c0ff6343a79af20db4eef3c