some fixes
Merge remote-tracking branch 'origin/kitkat' into kitkat

Conflicts:
	packages/SystemUI/res/layout/status_bar_expanded_header.xml