Merge "Address const issues in preparation for libcxx rebase."
am: cc50ea5

* commit 'cc50ea592f9b67b37d61a1952fc174489c588f80':
  Address const issues in preparation for libcxx rebase.