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