Merge "Fix const issues in preparation for libcxx rebase." am: dce9b61
am: 427fb72

* commit '427fb7216dd917b26ae74e979c136ced24c8c669':
  Fix const issues in preparation for libcxx rebase.