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

Change-Id: I8e564631d8c9beda3f19565fd2ecd0d47faeb260