Fixed a couple of bad dependencies

Change-Id: I8093705d8214924e656262b766a96a4fa980c8fa
Switch to using MySQL

Change-Id: I504ba9d613b12337125e521c183fa1a383a893d1