[automerger skipped] Cleanup NNAPI VTS tests am: 62749b917e am: f952adda07 am: fb3b426d6e am: d42bc350b2
am: 9b79387e48 -s ours
am skip reason: change_id I023997d8686ca65223858eed3a0881f5444ed2d6 with SHA1 bbe5dad266 is in history

Change-Id: Ife8c7925b30d3b05ecbee5899231bf710ee8440f