Address const issues in preparation for libcxx rebase.

Change-Id: I4eccc1b5a70da9dd325e1a7e10ab0a3fe588c03f
3 files changed