Merge changes If24c6b7c,I381b0103

* changes:
  image_generator: Fix the warnings on import order.
  Add tools/ to the style-checking path.