fixed unit tests
Merge branch 'development' of https://github.com/DIdiHL/plugin_android_library into culaucon

Conflicts:
	PluginAndroidLibrary/plugin_android_library/plugin_android_library.iml
Merge branch 'development' of https://github.com/DIdiHL/plugin_android_library into zhaoyue

Conflicts:
	PluginAndroidLibrary/plugin_android_library/plugin_android_library.iml