merge from froyo-plus-aosp

Change-Id: Iec3c2022aaea07b09ff09bcb690331385b30584b
tree: 9fc2bca039afb683fbe3b792f06bf229362bd380
  1. dictionaries/
  2. java/
  3. native/
  4. Android.mk
  5. CleanSpec.mk