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

Change-Id: I7ab9f65b41cbd2a8272810427529f46c6fbf2a0d
(cherry picked from commit 09a7987fb59ed6843d51acf0161d66ed3eb2252f)
1 file changed