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

Change-Id: I279271308104e021865847e8857c49291a1c4dc3