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

Change-Id: Ic9ad5d71681e5dc30af94faa4cc969095fe6e8ae