Merge "When deleting a db file, Context.deleteDatabase() has to be called...

Merge "When deleting a db file, Context.deleteDatabase() has to be called instead of File.delete() to guarantee all db related files like journal, wal, shm, etc are deleted together."