Adding some submodules for real

Apparently I didn't add them correctly last time...

Change-Id: I9c5da82032d95a77b7c2fc5937b4f86717319df1