gralloc: Fix some differences with compatibility code

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