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

* commit 'b250b8f1d67ba5c22b8ae7e090ec2f40ebfeb650':
  Make libnativehelper C++ library agnostic and remove libnativehelper_libc++.