Bug: 113627054 Test: NeuralNetworksTest_static Change-Id: I40d96d877151395e62e5b60d077635c5ca3ecce2 Merged-In: I40d96d877151395e62e5b60d077635c5ca3ecce2 (cherry picked from commit 02491835)