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