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

Change-Id: If5c28cb59f3de0405eaeab8069bac1959fb73b44