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

Change-Id: I8d4dbc7a7da974db99fcda0492e588f35315860c