Eliminating tools/ folder

Change-Id: I1999c3e0f45e451f4b1b11c68a395ef955ce7b0d