Conform to related hardware/interfaces/neuralnetworks changes.
am: e4dd0bdfad

Change-Id: I502ab22f5dc3a3778fbfda75c95bc294fe23adfb