Merge "gralloc: Fix AOSP Clang Compiler error"