Merge "Fix two strict mode warnings."
tree: 8bf6339a21a57e11aebc1eb09a1f991b48cfaf62
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk