Merge "Remove one more export of libandroid_support from ndk_libc++_shared"