Merge "Fix dex2dex logic"