Revert^2 "Fix headers in Gralloc.h."

This reverts commit 55d39483.

Reason for revert: CL was reverted due to temporary partial
topic merge weirdness, which should be resolved now.

Bug: 423974626
Test: presubmit
Flag: EXEMPT trivial cleanup
Change-Id: Ie598df646f57c02383a16a3964d07c467f6580fd