Updated Makefile and submodules to current masters

Change-Id: I554bdd3903ae4b40644d7c7cea991b15fc51c4a5