Merge "Fix an NPE when running with Keep." into lmp-dev
tree: 2491e9359ffcd21640611e99daf6e8d70a78c5ae
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk