Remove some duplicated CheckValid code.

Bug: 142722772
Test: ./runtests.sh
Change-Id: I9d004b56b37dfa08769db953ff4c230aa982c246
2 files changed