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

Change-Id: Ibd52888522e10f6db8cb228c326070b31f224eac