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

Change-Id: Ice6f9d8dfcec9032642964d770855580dcb086a3