Merge "edify: Remove VAL_INVALID and move ValueType into Value class."