Merge "Address const/non-const issues in preparation for libcxx rebase"