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

Change-Id: I572a85205bd39390aa5843e7c03b41244d0f1242