merge from froyo-plus-aosp

Change-Id: I297edc39b1076522bb50ffa67e5ee02c3bf0a40c
tree: 21f0c946d4fce46179e0655e1ec66ee1d1e0758c
  1. dictionaries/
  2. java/
  3. native/
  4. Android.mk
  5. CleanSpec.mk