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

Change-Id: Ia5c2c6af241430e700731b8b2de6f668a7778f76