Various android-related changes.

Get things running on OS X, and deal with missing java.