Fix some Android emoji issues.

- Remove PUA character for 'unknown flag' from cmap.
  Unfortunately, the contorted build process means we can't do this where
  we do our other cmap munging-- font.getGlyphID dies in emoji_builder
  if we remove it from the cmap in add_glyphs.py.  So we remove it at
  the end of emoji_builder.
- Forgot to remap one territory flag, missed it in the spreadsheet.  Also
  corrected a typo where I remapped the same flag twice.  Sorted the flags
  in key alpha order.

third_party/color_emoji/add_glyphs.py

@@ -85,9 +85,9 @@ EXTRA_SEQUENCES = {
 # Flag aliases - from: to
 FLAG_ALIASES = {
     'BV': 'NO',
-    'SJ': 'NO',
-    'UM': 'FR',
+    'CP': 'FR',
     'HM': 'AU',
+    'SJ': 'NO',
     'UM': 'US',
 }
 

third_party/color_emoji/emoji_builder.py

@@ -353,6 +353,21 @@ class CBLC:
 		self.pop_stream ()
 
 
+# copied from nototools/font_data
+_UNICODE_CMAPS = {(4, 0, 3), (4, 3, 1), (12, 3, 10)}
+
+def delete_from_cmap(font, chars):
+    """Delete all characters in a list from the cmap tables of a font."""
+    cmap_table = font['cmap']
+    for table in cmap_table.tables:
+        table_tup = (table.format, table.platformID, table.platEncID)
+        if table_tup in _UNICODE_CMAPS:
+            for char in chars:
+                if char in table.cmap:
+                    print 'removing %04x from %s' % (char, table_tup)
+                    del table.cmap[char]
+
+
 def main (argv):
 	import glob
 	from fontTools import ttx, ttLib
@@ -527,6 +542,11 @@ By default they are dropped.
 		drop_outline_tables (font)
 		print "Dropped outline ('glyf', 'CFF ') and related tables."
 
+        # hack removal of cmap pua entry for unknown flag glyph.  If we try to
+        # remove it earlier, getGlyphID dies.  Need to restructure all of this
+        # code.
+        delete_from_cmap(font, [0xfe82b])
+
 	font.save (out_file)
 	print "Output font '%s' generated." % out_file