Redux l'observers pour System oou-aye

A version of AOKP's recent commit for vanir. more to come.
http://gerrit.sudoservers.com/#/c/8684/

PS2: Just cleaned up, because Im useless otherwise
PS3: Missed a couple places

Change-Id: I7f104c0273452b783f2ce90ef15ff5cf1db15e8d