surfaceflinger: Add more ifdefs for secure display query

Commit f04661 forgot ifdefs in HWComposer.h that break ABI. This
broke at least grouper and endeavoru surfaceflinger.

Change-Id: I9a1bd4e1fb9a2ad5ac0a39e86ef8131b52526e32
Merge branch 'cm' into HEAD