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

Change-Id: I0b22b7e1f2fe3f943d8ff43643fbfcb2deaae854