Merge "Address const issues in preparation for libcxx rebase." am: 7f84a07
am: d219b4e

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