My feeble attempt to try and smash everything together so I can submit a
clean rebase.
Merge branch 'master' of https://github.com/yaronyg/couchbase-lite-android-core