Merge "gralloc: add mapper 3.0 to composer makefiles"