am a8b838b4: Merge "Fix a test and crash with a better error message when reading"

* commit 'a8b838b473d4927e6f0483912c45fba929dfb402':
  Fix a test and crash with a better error message when reading
tree: 58c40768b4e6658043e0ddb1ff9433cd517c4120
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk