Merge "edify: Remove VAL_INVALID and move ValueType into Value class." am: 503ff38043
am: d8a2c2682a

Change-Id: I4501ecddfad05ac9ab06c3c6d3bf0fe3c230f7f2