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

Change-Id: I18773ddeb981ee921dc795611264c95f70e7c7ff