Don't short circuit merging predicted types in FrameState

Summary: If we change the known type, we won't merge the predicted type.

Reviewed By: @jdelong

Differential Revision: D1737866

Signature: t1:1737866:1418430377:4d0fdb1683cec327b3fb398305043f1e1ed18c1d