Android 2.1 CTS release 2
reconcile main tree with open-source eclair