updated to head of couchbase-lite-android (Android Studio conversion)