fixing const/non-const issues in preparation for libcxx rebase

Change-Id: I8528edd3af4a801f29c17f1f54c44be1a1a0b563
1 file changed