Add control flow support to NNAPI VTS tests
am: 0fff59b961

Change-Id: I841bbb8e0ad338a417e177291f0d096b1c5b3e06