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