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

Change-Id: I30190980751548cc8a588201a778046060906d87