Merge "Fix issue #2528537: android.os.DeadObjectException" into froyo