Merge "Revert "Configurable verifier suite name."" into nougat-cts-dev