Fix build
Signed-off-by: scott <scott@ubuntu.com>

Change-Id: Icc2b5c37062ff4d95c34c7b1ded69a4c1d936aec
Merge branch 'beanstalk' of github.com:chrisc93/android_packages_apps_Settings into beanstalk