Android 2.1 release 2.1s
reconcile korg/master into goog/master