[automerger skipped] Refactor NNAPI VTS to remove unreasonable dependence between versions am: 73ee79dafa am: bc50034109 am: 92cc89a00e
am: 77f7ad39dd -s ours
am skip reason: change_id I4243d0b5e574255cef1070850f4d0a284f65f54e with SHA1 1d6b465997 is in history

Change-Id: I3c8b522a4a12a8468f54cbe96c02edcf817b4bbe