Merge "Add option for not copying dex"