Merge "SDK: Add missing tool dependencies"
am: d405a14f22

Change-Id: Icf62bb83b2d666a636364b0131170e158df4b864