am bbaa5419: am e4298641: Merge "Fix the Mac build by moving libcore to libc++."

* commit 'bbaa54199e5778e04656ab417a2bfc8cf53bd7b8':
  Fix the Mac build by moving libcore to libc++.