Merge "C2: Update graphic buffer allocation calls to allow odd dimensions" into main