Android: Fix crash on upgrade.

Quick fix to make sure upgrades don't crash.  (Long-term we might be able to find a more reliable way of doing this using DB versioning)