Address const/non-const issues in preparation for libcxx rebase
am: d1a8fe69ec

Change-Id: I8299121a44e93aea0f659f4373c89d4693092581