Merge "libgralloc: use proper types and type casts"