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

Change-Id: I1a4e3c656bd041357923ab2a87a9be92359d938f