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

Change-Id: I0dffcca7b5cd37abee6918b87e8f56d73c6430ca