* Add primary key to mathtable * Unify naming of database files Bug: 65525 Change-Id: I4f4d31c281257014734e9e3a8d7f1506855ea6d9