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