Android SDK tools release 3
Merge donut into master