Fix the path on Database component inclusion

Change-Id: I5e04231357185a92c2c4089eb1a8d1838c8070da
Merge "Fix the path on Database component inclusion"