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

Change-Id: Ic26748e94dcff9c386c628a6acc94ababd011fc6