Fix liblinphone and linphone tester

custom_rules.xml

@@ -73,7 +73,7 @@
 		<echo level="info">Creating library output jar file...</echo>
 		<property name="out.library.jar.file" location="${out.absolute.dir}/liblinphone.jar" />
 		<jar destfile="${out.library.jar.file}">
-			<fileset dir="${out.classes.absolute.dir}"
+			<fileset dir="bin/intermediates/classes/debug"
 				includes="org/linphone/mediastream/**/*.class  org/linphone/core/**/*.class org/linphone/tools/**/*.class"/>
 			<fileset dir="submodules/linphone/java" >
 				<include name="common/org/linphone/core/*.java"/>

default.properties

@@ -1 +1 @@
-version.name=""
+version.name=3.2.2-97-gf7378dac

prepare.py

@@ -216,6 +216,9 @@ install: install-apk run-linphone
 java-clean:
 \tgradle clean
 
+ant-clean:
+\tant clean
+
 $(TOPDIR)/res/raw/rootca.pem:
 \tcp liblinphone-sdk/android-{first_arch}/share/linphone/rootca.pem $@
 
@@ -309,7 +312,7 @@ generate-apk: java-clean build copy-libs $(TOPDIR)/res/raw/rootca.pem update-pro
 \techo "version.name=$(LINPHONE_ANDROID_VERSION)" > default.properties && \\
 \tgradle assembleDebug
 
-generate-mediastreamer2-apk: java-clean build copy-libs update-mediastreamer2-project
+generate-mediastreamer2-apk: ant-clean build copy-libs update-mediastreamer2-project
 \t@cd $(TOPDIR)/submodules/linphone/mediastreamer2/java && \\
 \techo "version.name=$(LINPHONE_ANDROID_VERSION)" > default.properties && \\
 \tant debug