Just re-run --update_golden, to get it all into canonical format,
to minimize the size of the next diff.
Apparently these have been hand-edited a lot.
Change-Id: Ib7dbd9d629b5501280652c695f538007934708d4
czninc/kv cannot be shared (locks), so a separate directory
is needed in the multiple publish root case, for the thumbs caches.
Change-Id: I8c07302778e597a2ccf9b3265111a503dd037249
mpl