Android SDK ADT release 20
Reconcile with ics-mr1-release

Change-Id: Ie56fed7bf2508fbf1d9fa89b58c2b2ac9d5793e2