fixing const/non-const issues in preparation for libcxx rebase
am: 9c8f93a2a6  -s ours

Change-Id: Ibc845ffd06bb03d910f505b2a581d2f729a1ae2b