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

Change-Id: Iec68bcf6db93a8f0c07eb4578e8c8239b7542642