Address const issues in preparation for libcxx rebase.

Change-Id: I389e585b11647763f7b4f4dbf1181acc85ba36d4
1 file changed