Revert "Active display: Add options for date and am/pm [1/2]"

This reverts commit 1f1d8812d237c0494a21bf3f8bb365c7875441b6.
Revert "Correct active display settings naming"

This reverts commit 52b00cbf16da532992dc434571e81b20179abaaf.
Revert "Add active display to ChameleonOS [1/2]"

This reverts commit 46abc4b6731514370b7ede76c1005e6a670b1218.
Merge github.com:LiquidSmooth/android_frameworks_base into jb3