Merge "Add tools to subdirs"
am: 1d6a0403a5

Change-Id: I05a8740f584b43f3cae5b3ac5747b7ee22ce6234