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

Change-Id: I79d6dc3ddce8961d5eccafd533ff36ffe55edfdd