Fix some warnnings reported by eclipse.

Change-Id: I40037e0735ddbca750cbe5f8364af5247992c51c
13 files changed