Merge "Fix opcode tests for invoke_*" into froyo