Merge "gralloc1: update aligned size of buffer in native handle"