Merge "Add tools to subdirs" am: 1d6a0403a5
am: 1b32f2bbe4  -s ours

Change-Id: Ia384e4348f89f6a98092871dc985d3d64c72d0c1