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

Change-Id: Ifbb30998d404c1c933d17677f42fb1451e17cbbf