Merge "Address const issue in preparation for libcxx rebase."
am: a2a13e3

* commit 'a2a13e3267850b4eaf2689b0e02cc499228b7bf5':
  Address const issue in preparation for libcxx rebase.

Change-Id: Ia54835c35695ae76b3c093adfb256bab2446ff65