am 53b37dc0: Merge "Fix a layout problem for pre-MR2"

* commit '53b37dc098daf99151bf1b38d04bd202f8a3ba03':
  Fix a layout problem for pre-MR2
tree: 5674f23d7e2186482a5153bcf1f46eb42c3be909
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk