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

Change-Id: Ic509d47e7f459b867b89306d6bb3a79a6b40bf94