Merge "Address const issues in preparation for libcxx rebase." am: 64ade5d
am: 170c93f

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