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

Change-Id: I349e4730959e5624fe805a0cc261f088a66b6e18