Fix explicit instantiations

Summary: This fixes explicit instantiations of android::Singleton.

Test Plan: verified

Reviewers: randall.rushing, synergy

Reviewed By: synergy

Differential Revision: http://review.codefirex.com/D145
Dont include this if using a qcom display variant

Summary: ..

Test Plan: ..

Reviewers: synergy

Reviewed By: synergy

Differential Revision: http://review.codefirex.com/D147