Merge "Preload libnativehelper.so which cannot be loaded through the Java classloader." am: 9ab1d61496
am: e65afdf28a

Change-Id: Ic45ee2190d9d98da009d7890fdc45c68c9132fac