Minor Android 2.2 updates.