Revert "Fix for gralloc"

This reverts commit af28815c7d69f20036687821a96ebda9e767aa3e.