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

Change-Id: If884eefb53dda56f9d0135993cea8dfbed6a592b