Merge "Make libnativehelper C++ library agnostic and remove libnativehelper_libc++."