Fix compile error due to singleton changes in MR1

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

Change-Id: Id7609b2e676d2c7b0636730636f01aca49038f14
Merge "Fix compile error due to singleton changes in MR1" into jellybean