Twelve: Swap genre and genre uri fields

URIs should always come first since that's the thing that identifies
them

Change-Id: I0ab2fb90abd7f20ad0d6f303eb2ce8b12e5ca5f4
2 files changed