Merge "webkit: workaround incompatible operand types"