Merge "Move tools to separate directory."
am: d312abe7c0

Change-Id: I824bf8bb7598383c9ffa4da8b9ffc1c7ded04268