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

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