Don't use deprecated CdbReader/CdbWriter classes

Change-Id: I795ca9899d4f3ec0e99effb348745f56fe666391