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

Change-Id: Ie37047344c3707cc7880faa64f1b619044e21ed1