fix build
Revert "Multi-user support for phones [2/2]"

This reverts commit 4d5cf5c35e3eeac11843517f5dd79a1180bfea14.

Conflicts:
	res/values/crom_strings.xml
Re-Enable power menu
Settings: Add HeadsUp setting.

Change-Id: Ib7a59145843bedb16aacc87bf6d3c6da143e8d3e

Conflicts:
	res/values/cm_strings.xml
	res/xml/notification_drawer.xml
Revert "Re-Enable power menu"

This reverts commit a58a9a7e0c5b95943f8639db183b0f5dab5b72bd.
Revert "Revert "Multi-user support for phones [2/2]""

This reverts commit 6d33de4a3aa7d3813b5ff54621be5dff8130ba81.
Merge remote-tracking branch 'upstream/kitkat' into kitkat