Merge "Address const issues in preparation for libcxx rebase." am: b2cb35e am: 4e39764
am: 7b2125d

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

Change-Id: I694ccb7de01cd37e84cd03d912381a39b7a42b01