Update to submodules and make script

Change-Id: I650c0d8b23d67b22cfb5b5b49ac3f9171b754ed0