Updating submodule pointers and unifying the makefile

Change-Id: Iadc058fbee6d3fbb92d8647a82339b005feab035
Updated Makefile and submodules to current masters

Change-Id: I554bdd3903ae4b40644d7c7cea991b15fc51c4a5
Updating make files per changes to production branch

Change-Id: I635986e8be4a155bf35db1c0aa1744fc6769f49b
Updating submodule pointers

Change-Id: Id9c3f5328ac342e171b135b37039867cf880b233
Updating submodules to master

And removing non useful build step

Change-Id: Ie981e1d2032a2050a351a8240692c61ade53df9f
Merge remote-tracking branch 'origin/master' into wmf-deploy

Conflicts:
	.gitignore
	Makefile

Change-Id: I3a184b1cc62126394e9edfe59cf30e76ec7cd670