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

Change-Id: I88e79a95af5c4bcca6023ef8c99d00d8ebafada0