DO NOT MERGE.  Fix more keys for fr_CA and fr_CH.  Also tidy up more keys for de_ZZ as well.

This is a cherry pick of http://android-git.corp.google.com/g/156427 from master.

bug: 5800592
Change-Id: Ifb249e8b6d432bbd1a5faf1a8731deea02962d39
3 files changed
tree: d8f5600c8be13064686f2385a22b24085b542098
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk