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

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