Some lines were in wrong order, some duplicate images were not removed.

The sanitizing script still reports some duplicates, but they are not
bit-to-bit the same; need a check by a human.

Change-Id: Ic28533ab768dbe0d375f81dfed4bac75bb44d18d