Merge "Remove export from libnativehelper_compat_libc++"
am: 786908aa29

Change-Id: I5f96fbf9aa8ef9f883a9675e7fcd1f153d05025c