Merge "Simplify NNAPI VTS TEST_MAPPING options"