Merge "Simplify NNAPI VTS TEST_MAPPING options" am: 950dcb63cf am: cf57e42449
am: 2951b226a2

Change-Id: I98e6aafcac065e5040652acdf9865733b3898722