Merge "Fix const issues in preparation for libcxx rebase."