Merge commit 'f882f8e29b6dca40cf93da467120e31b97e27d91' * commit 'f882f8e29b6dca40cf93da467120e31b97e27d91': update gralloc to match the generic version structure