Merge "Cleanspec for libc++ migration."