Merge "Move frameworks/base over to libc++."