Merge "NNAPI VTS: decouple 1.2 tests from 1.3 types" into rvc-dev