Merge "Move Cdb classes into includes/libs/cdb/"