Bug 461219 - Compile warnings in official build

Change-Id: I48f14fe5c9ee51a09ede0bc30380cb8e55b5ada2
12 files changed