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

Change-Id: I564b3e258a12d5604022d926b0dc5540066f28c7