Fix compiler warnings

Change-Id: I1c34736352cc4e6550fb978269e055f1ea70fcef
Merge "Fix compiler warnings" into cm-10.1