Merge "Don't preload libneuralnetworks.so" am: af15eff03b am: 07348eb619
am: 401cea4f35

Change-Id: Idfd58124370400892d83af94b971eb9b90f3f40a