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