Merge "NNAPI VTS fix from NNAPI CL: Cleanup HalInterfaces.h"