Merge "Enable libnativehelper with linux_bionic"