[automerger skipped] Add control flow support to NNAPI VTS tests am: 0fff59b961 am: bec4c4084f -s ours
am skip reason: Change-Id I1e436cdba404b68026a45797ac4fb3a34f8be76a with SHA-1 1f98e2e929 is in history

Change-Id: I16ce63f5379b19db3ed78a94228048da3ca76601