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