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

Change-Id: Ie9ba34ca05702a7a254c6f07db5d975032e3ae86