Fix compile error due to singleton changes in MR1

http://review.cyanogenmod.org/#/c/30269/ shouldn't be needed anymore.

Change-Id: I99d4129f67c270781e4cbdf96040aa4cdb713ffd