Revert "Clean up"

This reverts commit 8db340708e5953f05cd76bb85e23d7c71ace82f5.
Revert "Add ActiveDisplay from ChameleonOS"

This reverts commit cced87df5417014be465962e034f30c62d3bb9da.

Signed-off-by: Kristofer Ard <kristoferard@gmail.com>

Conflicts:
	res/values/aospx_arrays.xml
	res/values/aospx_strings.xml