We don't really need both tools and utils directories. Change-Id: I25509b436b721590225736b54cd0fbebbe2a6b14