Appbar changes to compile and work with new CM "Display Settings: Better font size control" commit

Change-Id: I3ef5e525a471b07887fa158cc6d6e694984a1cce
Merge branch 'cm-10.2' of github.com:torrented/android_packages_apps_Settings into cm-10.2