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

Change-Id: I66ba4eb1ec3d634e378aaad081f4d690a625e356