Merge "Remove export from libnativehelper_compat_libc++"