Merge commit 'e7d05d5e31803b94c2d468bddb0525c1cd3baafd' * commit 'e7d05d5e31803b94c2d468bddb0525c1cd3baafd': make gralloc_priv.h for msm7k and qsd8k identical and C friendly