Merge "Simplify NNAPI VTS TEST_MAPPING options"
am: 950dcb63cf

Change-Id: I0e671beccc5486bf91c8f11f8f589d300ba9068b