Address const/non-const issues in preparation for libcxx rebase
am: 497951caa6

Change-Id: I0a06ecb541f59296f4d39496abb22f07d1a38bc4