[automerger skipped] Merge "Consolidate NNAPI VTS utility code" am: 71cb010ba3 am: 672607596f am: 59e0f264f5
am: 8c06c1cb41 -s ours
am skip reason: change_id Ic401bb1f1760cc10384ac0d30c0c93409b63a9c7 with SHA1 e16af0a44b is in history

Change-Id: Ib445978c1cf021964aad2591865df87752fdb2a3