Corrected some compiler complaints

Change-Id: I17f2445b61f06d4fa252d2b30ea0c3066f6af246
Merge branch 'cm-10.2' of https://github.com/mcsaucy/android_device_google_steelhead into cm-10.2