[automerger skipped] Update NNAPI VTS test makefile after adding...
[automerger skipped] Update NNAPI VTS test makefile after adding AHardwareBuffer support am: e586a238 am: f8f124db
am: 1d033ae7 -s ours
am skip reason: change_id Ib98c08ce5cbbcd46f66ade80af28569f9cb14449 with SHA1 276b55b9 is in history
Change-Id: Ic54d673ac95bf805ca762f45afd02b80b076ac90