Merge "Better handling of DB corruption in SQLiteDatabase.open()"