am c4887bcf: am b8f2a592: am b9178f75: Merge "Adds a libc++ version of libnativehelper"

* commit 'c4887bcf42c04405502302eda13513bfbda29c79':
  Adds a libc++ version of libnativehelper