Merge "Revert "Move rewritten StringFactory call results into dex registers for deopt""