Update dependencies and cleanup mk files

Change-Id: I4d754918380da46ad9d660325f5f2cccb46bf902
Signed-off-by: Josue Rivera <prbassplayer@gmail.com>