code cleanup (synchronization with C++ version)
Merge branch 'master' into android-1.5
since 1.7.3 we will not use proguard for apk obfuscation
VERSION => 1.7.3
Merge branch 'master' into android-1.5

Conflicts:
	AndroidManifest.xml
no force start for library service
Merge branch 'master' into android-1.5