Update to Android 2.3.1

Implements #1039.

This is a breaking change.