Add Android support for android to possible to read this sqlitedb
Merge branch 'master' into android

Conflicts:
	src/dbbuilder.c