Merge "gralloc1: Add additional tracing"