Merge "Consolidate NNAPI VTS utility code"
am: 71cb010ba3

Change-Id: I5bcbe8135d6ecef5f263a46e2b382976d077f87f