Add Android agent for 3.5.0

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.emulator/src/main/java/org.carbon.android.emulator/Constants.java

@@ -48,6 +48,6 @@ class Constants {
     static final String OS_TARGET = "os.target";
     // WSO2 AVD specific variables
     static final String WSO2_AVD_NAME = "ENTGRA_AVD";
-    static final String APK_LOCATION = File.separator + "resources" + File.separator + "android-agent.apk";
+    static final String APK_LOCATION = File.separator + "resources" + File.separator + "client-debug.apk";
     static final String WSO2_CONFIG_LOCATION = File.separator + "resources" + File.separator + "config.ini";
 }

components/mobile-plugins/android-plugin/org.wso2.carbon.device.mgt.mobile.android.ui/build.xml

@@ -28,9 +28,6 @@
     </target>
     <target name="zip" depends="clean">
         <zip destfile="${target-dir}/android-tryit.ZIP" update="true" duplicate="preserve">
-            <zipfileset
-                    dir="src/main/resources/jaggeryapps/devicemgt/app/units/cdmf.unit.device.type.android.type-view/public/assets/"
-                    includes="android-agent.apk" fullpath="resources/android-agent.apk"/>
             <zipfileset
                     dir="target/"
                     includes="JavaApp.jar" fullpath="JavaApp.jar"/>