NNAPI Combine Compatability test with VTS test am: 3247f76e35
am: 52da1b820c

Change-Id: I8b64c6134d2af39ae5acd51cb0520e820d29d9e2