sync upstream
Merge branch 'master' of github.com:illarionov/android-sqlcipher-spatialite into openssl

Conflicts:
	.gitmodules
	Makefile
	external/Android.mk
	ndk-modules/android-openssl/libs/armeabi/libcrypto.so
	ndk-modules/android-openssl/libs/x86/libcrypto.so
	ndk-modules/android-openssl/openssl
	ndk-modules/android-platform/platform_frameworks_base
	ndk-modules/android-platform/platform_system_core
	ndk-modules/android-sqlite/android-sqlite
	ndk-modules/icu4c/icu4c
	ndk-modules/sqlcipher/sqlcipher