Sure, little point for them with the other stuff here in connectivity
either, but those parts at least compile. If/when I get back to
getting the --disable-database-connectivity thing to work, all of
conectivity will be bypassed for Android and iOS, of course.

Change-Id: I4eeeb9ccdf46fb2e1df8bf75aef63e17cbb97bbf