More fixes to repos/paths. The manifest works now.

Change-Id: Iee2cf1b41c8d6c8cb864c782ba7c4709cec7dec6