Merge "Address const issue in preparation for libcxx rebase." am: a2a13e3 am: 61e5a66
am: 0bab7c3

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

Change-Id: Idaffc014595c1e29feac958fb008473b3c346f28