Merge "Normalize GL_UNPACK_ALIGNMENT"