NNAPI VTS fix from NNAPI CL: Cleanup HalInterfaces.h am: 3835f61986 am: 8f77ce7442
am: fe4464fa0c

Change-Id: I25ea02acad167d9f8905be0f2fcd95573560a158