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

Change-Id: If715c9bdf42f18e5f1813a3d5a7ea5d046fbefb3