am a8ec322b: am bc43e3f2: Reconcile with jb-mr1-release - do not merge

* commit 'a8ec322b1a24111aa3e7e533d00586536212ff7b':
tree: 45c069fafd577f82b554478ad9a3d49204020aff
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk