Reconcile gingerbread-plus-aosp and honeycomb

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