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

Change-Id: If6f56b1e5a40bb848fd631ef52d76df8bb75a561