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

Change-Id: I2be0f92f61ec0d8570f382c6d6e071081f04fa68