Merge "Adds a libc++ version of libnativehelper"