Reconcile with ics-mr1-release

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