Merge "Just check in tools.h."
am: 5edeadb53b

Change-Id: I2e47504d60f963f994c6486b031a3d9c9588cb0e