Merge pull request #1061 from blackberry/master

Merge master to next

template/android/template.build.xml

@@ -62,9 +62,10 @@
        If this is not done in place, override ${out.dex.input.absolute.dir} */
        -->
     <target name="-post-compile">
-        <copy todir="assets/res">
-            <fileset dir="../res" />
-        </copy>
+    	<delete dir="assets/res"/>
+        <copy todir="assets/res">
+            <fileset dir="../res" />
+        </copy>
     </target>
 
     <!-- Import the actual build file.