Merge "gralloc: Fix getSize and getAlignedWidthAndHeight"