Merge "Adapt dalvik to new libnativehelper"