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

Change-Id: I5a9c5f4927aed6aa31efcdd40f8e52d7a4213fc3