FIX

Change-Id: Ib0144cb270d185754bdbfa575d360f7adc625667
Revert "FIX"

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

Change-Id: I3ef5e525a471b07887fa158cc6d6e694984a1cce

Conflicts:
	res/values/attrs.xml