Move CdbTest into includes/libs/cdb as well

Change-Id: If0ad645129692129d5674fd0e6651032b03a13c0
Merge "Move CdbTest into includes/libs/cdb as well"