Code cleanup - fix compile warnings.

Change-Id: Iaa8014cb49861e8fe2e08ec90c36f73bf9b08721
16 files changed