Map U+200B (zero width space) to an empty string

Also contains changes from Ib63f16a8 as generateEquivset
wasn't run for it.

Bug: 62049
Change-Id: If5baf97ebc4a9a592d107251ba3e42e2d089ef6e
Merge "Map U+200B (zero width space) to an empty string"