Merge "Add option for not copying dex"
am: 62d45e0b9a

Change-Id: Ic961afe44e1214f9568567273a83d8bd1082b8b5