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

Change-Id: I79ee0cdfb3780fcad544b79066b0845a0e1c027e