am 40a6d4af: Merge "Cleanups in geometry_utils.h" into jb-mr1-dev

* commit '40a6d4af2a454323601c2c5ff8d95863eefedd86':
  Cleanups in geometry_utils.h
tree: 7b184a3cf8dbe58a8e11c8850f5e605deac9d64f
  1. dictionaries/
  2. java/
  3. native/
  4. tests/
  5. tools/
  6. Android.mk
  7. CleanSpec.mk