Reconcile with gingerbread-release

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