Merge "Preparation for transition to libc++."