Merge "Revert "Increase neuralnetworks compatibility to 1.3"" am: c805505344 am: 5b33b3e129 am: 9c0273b979
am: f47b9f9625

Change-Id: Iec8d447df883a4316a20a668e42fed4fcaf94b8e