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

Change-Id: I4274f3d58585bd55ffc32ee8d83932a0626bac05