Merge "NNAPI VTS update in response to utility function change" am: 7261ba7d10
am: 3bc25b4e5d

Change-Id: I0d0b0e18215dfccd74f66e66e210d0fae3e3013d