Merge "Fix the Mac build by moving libcore to libc++."