surfaceflinger: Fix building with display-caf + QCOM_BSP

We need the right gralloc header in here

Change-Id: Iaef1a1b9e4b5c9a93ace0dfa2a427ee8ae026e7b
Merge remote-tracking branch 'cm/cm-10.2' into cm-10.2