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

Change-Id: Ia94829e94963b8555d6987661bf377f8652a83ac