[automerger skipped] NNAPI VTS fix from NNAPI CL: Cleanup HalInterfaces.h am: 3835f61986 am: 8f77ce7442 am: fe4464fa0c am: 4c906e53a1
am: 399272c504 -s ours
am skip reason: change_id Idb228e37615af7c0343a09f9a51de378e63bdb5a with SHA1 4745a3d96e is in history

Change-Id: I87d8bb9c10eebdb6efcb55012209877597eef4f7