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