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

Change-Id: If1615dad79e6163bbf569c1e4c8af2f32338649b