Merge "split gralloc.$(TARGET_PRODUCT)"