Merge "Update HInstruction::NeedsCurrentMethod." am: 68f1128b3f am: c44d516918
am: a206d58a06

Change-Id: I661a885a671cee7bdcfec06286c486331efe4e3b