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