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

Change-Id: Ie1dbc97d2167f19930ca2f1a532264d2b28e70be