Make diffing resources SUCK A WHOLE LOT LESS

Revert "Just some cleanup"

This reverts commit fddc17f4812e094d364cfa49020008058629919f.

Conflicts:

	core/res/res/layout/keyguard_emergency_carrier_area.xml

Change-Id: I369e8763b5d09ffdf8e57aa7d7818cdc8b510828