Settings: Fix some more build errors

Signed-off-by: Chintan Shah <cgintan1998@gmail.com>
Merge branch 'kk-4.4' of https://github.com/TheSchismROM/android_packages_apps_Settings into kk-4.4