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

Change-Id: I558cc523ddf98906dc549642c6d71ed077f5abb1