Remove dangling references to deleted submodules. am: cb4dd90cba
am: 60997738cc

Change-Id: If89ccf6a568677b501ec3c3c60d75e4696ede16e