Merge "Allow T mainline connectivity code to link libnativehelper."