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

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