Merge "Statically link to libnativehelper"