Updating submodule pointers and unifying the makefile

Change-Id: Iadc058fbee6d3fbb92d8647a82339b005feab035