Merge "Remove export from libnativehelper_compat_libc++" am: 786908aa29 am: bb0def5383
am: 2329eec4ec

Change-Id: I54e622b7f58d5292d1e10c802b43bc1ea4417801