am d2326f49: am aa785a22: Merge "Make libnativehelper C++ library agnostic and...
am d2326f49: am aa785a22: Merge "Make libnativehelper C++ library agnostic and remove libnativehelper_libc++."
* commit 'd2326f49':
Make libnativehelper C++ library agnostic and remove libnativehelper_libc++.