Merge from jb-mr1-aah-dev

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