Merge "Change NNAPI VTS TEST_MAPPING to restrict testing on sample drivers"