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

Change-Id: Idb8a6f5ee4307754a790394e8868857927c334d1