Updating submodules to master

And removing non useful build step

Change-Id: Ie981e1d2032a2050a351a8240692c61ade53df9f