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

Change-Id: I3f27476b035b257743b01e528dc62e7a31ffbab9