[automerger skipped] Update NNAPI VTS test makefile after adding AHardwareBuffer support am: e586a23815 am: f8f124db0b
am: 1d033ae7cd -s ours
am skip reason: change_id Ib98c08ce5cbbcd46f66ade80af28569f9cb14449 with SHA1 276b55b900 is in history

Change-Id: Ic54d673ac95bf805ca762f45afd02b80b076ac90