Fix compile warnings and build.

Change-Id: Ib5afe055f216f7bb3020afbe2d66b7dd72808d2c
Reviewed-by: Lorn Potter <lorn.potter@jollamobile.com>