Merge "Change NNAPI VTS TEST_MAPPING to restrict testing on sample drivers" am: 3d3c792bb8
am: fb196c4365

Change-Id: Ic42dbe2547f06af97ace9f1472d63ca21a89a86d