Merge "Cleanup framework test defs." into froyo