Settings: Fix build warnings

This commit fixes build warnings caused by
http://review.cyanogenmod.org/#/c/31894/ and
http://review.cyanogenmod.org/#/c/31897/

Change-Id: If93f5a3111691b8fb928db426ce81936ce116dc4
Merge remote branch 'cm/cm-10.1'