Update to reflect top level submodules

Change-Id: Ib7644fba703077ce657f05ad05a35bbb7d2d6bf3
Merge branch 'update-submodule-setup'

Change-Id: I3e8f2a885e9bf064366894facd7b1abd8594efd6