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

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

Change-Id: I1c2236db56c9fee2d1c9e9dcff8a61dca2cac303