Tweak metabook.json to better match spec.

Put the 'type' field at the top of each object; add 'type' field to
FileRepo objects.

Change-Id: I7462c80d7456051578b1b4e69ed1a7aeda55abd8