surfaceflinger: pick proper includes

Change-Id: Ie0bf520bfa718404109245b947f26a29fdb0de69