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

Change-Id: I8aa162171ccb8fa3c00f435268a79e7dcf93cef5