am c03330c2: am ac78633b: Rename and consolidate some constants

* commit 'c03330c202ec0af8126e15bbe2664f88f9696e1f':
  Rename and consolidate some constants
tree: a925a1b485cf92c9fab53fa2ec879bb852325832
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk