Fix some ans const warnings.

Change-Id: I508d497803d0c1085aa6a8b26d7a574cb27dd6e2
4 files changed