Merge "Workaround for apps using a copy of libnativehelper"