Merge "Remove extra tests from NNAPI VTS validation tests" into rvc-dev