Reconcile with gingerbread-release

Change-Id: I6cdfd6015906695c20b6249783d32ccf2e322acd
tree: b5aecaeaf1c2e03cd2447d5c98fa80c2aa27d52f
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk