Cleanup compile warnings.

Change-Id: I1a53e7586ca79243f583828e9f3499fab3af9746
3 files changed