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

Change-Id: I725fb2ce6d6985efe703b50534fded68d92fb000