Merge "gralloc: Add support to enable UBWC aligned framebuffer"