Revert "fb: TRDS 3.0 and new theme engine preparation (1/4)"

This reverts commit 5b675e42c12f9110e52856e34d3305d73d9335b7.

Conflicts:
	core/java/android/provider/Settings.java