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

Change-Id: Ic1e79c3ec9c7ce4ff2d5d877108f8237342cf7d6