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

Change-Id: Ia8540f15eba0886f12d70864c4eb7163bb10f1e1