Revert "build fixes"

This reverts commit d4db18c2de5cb64b41af971bbc973bed4bdad1ff.

Conflicts:

	packages/SystemUI/res/layout/navigation_bar.xml